Accept a NULL style.

Sat Jun 26 00:40:02 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
	* gtk/gtkiconfactory.c (gtk_icon_set_render_icon):
	* gtk/gtkstyle.c (gtk_default_render_icon): Accept a NULL
	style.

diff --git a/ChangeLog b/ChangeLog
index 8c29953e0e879a34a74f55b3ef9dda5a90b93399..64977af0c39369d84d1f073be4a9998ce326c457 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun 26 00:40:02 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (render_icon_name_pixbuf): 
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): 
+       * gtk/gtkstyle.c (gtk_default_render_icon): Accept a NULL 
+       style.
+
 Sat Jun 26 00:04:36 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentrycompletion.c (gtk_entry_completion_set_model): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8c29953e0e879a34a74f55b3ef9dda5a90b93399..64977af0c39369d84d1f073be4a9998ce326c457 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sat Jun 26 00:40:02 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (render_icon_name_pixbuf): 
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): 
+       * gtk/gtkstyle.c (gtk_default_render_icon): Accept a NULL 
+       style.
+
 Sat Jun 26 00:04:36 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentrycompletion.c (gtk_entry_completion_set_model): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8c29953e0e879a34a74f55b3ef9dda5a90b93399..64977af0c39369d84d1f073be4a9998ce326c457 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sat Jun 26 00:40:02 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (render_icon_name_pixbuf): 
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): 
+       * gtk/gtkstyle.c (gtk_default_render_icon): Accept a NULL 
+       style.
+
 Sat Jun 26 00:04:36 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentrycompletion.c (gtk_entry_completion_set_model): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8c29953e0e879a34a74f55b3ef9dda5a90b93399..64977af0c39369d84d1f073be4a9998ce326c457 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sat Jun 26 00:40:02 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (render_icon_name_pixbuf): 
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): 
+       * gtk/gtkstyle.c (gtk_default_render_icon): Accept a NULL 
+       style.
+
 Sat Jun 26 00:04:36 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkentrycompletion.c (gtk_entry_completion_set_model): 

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index b1accbc0069bae1520878a2b53c2c1f6a578c6cf..52b50e8642f7562105c6bb3ce4d2269203751183 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1595,7 +1595,7 @@ render_icon_name_pixbuf (GtkIconSource    *icon_source,
   
   if (widget && gtk_widget_has_screen (widget))
     screen = gtk_widget_get_screen (widget);
-  else if (style->colormap)
+  else if (style && style->colormap)
     screen = gdk_colormap_get_screen (style->colormap);
   else
     {
@@ -1768,7 +1768,7 @@ gtk_icon_set_render_icon (GtkIconSet        *icon_set,
   GdkPixbuf *icon;
   
   g_return_val_if_fail (icon_set != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
+  g_return_val_if_fail (style == NULL || GTK_IS_STYLE (style), NULL);
 
   if (icon_set->sources == NULL)
     return render_fallback_image (style, direction, state, size, widget, detail);

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index ca3d770cd5f6b6352114922d2e0bc2b19a03d845..75d7366e5184393128bd5e8ac5a05279f13d5b0d 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -2164,7 +2164,7 @@ gtk_default_render_icon (GtkStyle            *style,
       screen = gtk_widget_get_screen (widget);
       settings = gtk_settings_get_for_screen (screen);
     }
-  else if (style->colormap)
+  else if (style && style->colormap)
     {
       screen = gdk_colormap_get_screen (style->colormap);
       settings = gtk_settings_get_for_screen (screen);